Let smplrout and csv_util work with multi-mode stuff. From gtoevan@gmx.net.

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index f50717445fbbedc4e989f5b95139b3ba5feb2037..85dd77ef280705d3b36af5297ad0699f2bf623ea 100644 (file)
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -849,17 +849,9 @@ xcsv_data_write(void)
        fprintf(xcsv_file.xcsvfp, "%s", xcsv_file.record_delimiter);
     }
 
-    switch (global_opts.objective ) {
-        case wptdata:
-            waypt_disp_all(xcsv_waypt_pr);
-            break;
-        case rtedata:
-       case trkdata:
-            route_disp_all(xcsv_noop,xcsv_noop,xcsv_waypt_pr);
-            break;
-        default:
-            break;
-    } 
+    waypt_disp_all(xcsv_waypt_pr);
+    route_disp_all(xcsv_noop,xcsv_noop,xcsv_waypt_pr);
+    track_disp_all(xcsv_noop,xcsv_noop,xcsv_waypt_pr);
 
     /* output epilogue lines, if any. */
     QUEUE_FOR_EACH(&xcsv_file.epilogue, elem, tmp) {

diff --git a/gpsbabel/smplrout.c b/gpsbabel/smplrout.c
index 90f188263bbfea19c11ffa5a0a989a54b216a014..401317798cfb6456dea7f9b5e4050866b5df7950 100644 (file)
--- a/gpsbabel/smplrout.c
+++ b/gpsbabel/smplrout.c
@@ -218,6 +218,7 @@ void
 routesimple_process( void ) 
 {
        route_disp_all( routesimple_head, routesimple_tail, routesimple_waypt_pr );
+       track_disp_all( routesimple_head, routesimple_tail, routesimple_waypt_pr );
 }
 
 void
@@ -226,10 +227,6 @@ routesimple_init(const char *args) {
 
        count = 0;
 
-       if ( global_opts.objective != rtedata &&
-            global_opts.objective != trkdata ) {
-               fatal(MYNAME ": This filter only works in route (-r) mode.");
-       }
        if (countopt) {
                count = atol(countopt);
        }